*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac5a40ba67f7673cbfff3a87a89deacdf8004b9f..403a0d742ed9b4cf518a123bf6d9e9b390c9753a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-30  Daniel Pfeiffer  <occitan@esperanto.org>
+
+       * files.el (auto-mode-alist): Add makepp suffix and optional mk on
+       Makeppfile.
+
+       * progmodes/compile.el (compilation-error-regexp-alist-alist): Add
+       makepp diagnostic.
+
 2006-05-29  Richard Stallman  <rms@gnu.org>
 
        * help.el (temp-buffer-max-height): Doc fix.